From 0c248243dde8f84a9e318f6546969458b0aa8307 Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Thu, 19 May 2005 18:54:53 +0000 Subject: [PATCH] bitkeeper revision 1.1389.9.7 (428ce0fdsuCnf-S1a6GKzoV3SoBEvQ) Catch up with recent removal of pci.h from Xen core --- xen/arch/ia64/acpi.c | 2 +- xen/arch/ia64/dom_fw.c | 4 --- xen/arch/ia64/tools/mkbuildtree | 2 ++ xen/arch/ia64/vcpu.c | 4 +-- xen/include/asm-ia64/config.h | 44 +-------------------------------- 5 files changed, 6 insertions(+), 50 deletions(-) diff --git a/xen/arch/ia64/acpi.c b/xen/arch/ia64/acpi.c index c49371537a..a5f8cbc80c 100644 --- a/xen/arch/ia64/acpi.c +++ b/xen/arch/ia64/acpi.c @@ -30,7 +30,7 @@ #include /*#include */ #include -#include +//#include /*#include */ #include #include diff --git a/xen/arch/ia64/dom_fw.c b/xen/arch/ia64/dom_fw.c index 9b91950d23..d68d0baaa4 100644 --- a/xen/arch/ia64/dom_fw.c +++ b/xen/arch/ia64/dom_fw.c @@ -9,10 +9,6 @@ #include #include -#ifdef CONFIG_PCI -# include -#endif - #include #include #include diff --git a/xen/arch/ia64/tools/mkbuildtree b/xen/arch/ia64/tools/mkbuildtree index 5ffbd3efc8..cb0d8a3b9b 100644 --- a/xen/arch/ia64/tools/mkbuildtree +++ b/xen/arch/ia64/tools/mkbuildtree @@ -309,6 +309,7 @@ softlink include/linux/timex.h include/asm-ia64/linux/timex.h softlink include/linux/topology.h include/asm-ia64/linux/topology.h softlink include/linux/seqlock.h include/asm-ia64/linux/seqlock.h softlink include/linux/jiffies.h include/asm-ia64/linux/jiffies.h +softlink include/linux/jiffies.h include/asm-ia64/linux/jiffies.h null include/asm-ia64/linux/file.h null include/asm-ia64/linux/module.h @@ -329,6 +330,7 @@ null include/asm-ia64/linux/serial.h null include/asm-ia64/linux/serial_core.h null include/asm-ia64/linux/seq_file.h null include/asm-ia64/linux/cpu.h +null include/asm-ia64/linux/ioport.h softlink include/linux/byteorder/generic.h include/asm-ia64/linux/byteorder/generic.h softlink include/linux/byteorder/little_endian.h include/asm-ia64/linux/byteorder/little_endian.h diff --git a/xen/arch/ia64/vcpu.c b/xen/arch/ia64/vcpu.c index 29b20a4df0..768b2ba3b6 100644 --- a/xen/arch/ia64/vcpu.c +++ b/xen/arch/ia64/vcpu.c @@ -1581,7 +1581,7 @@ IA64FAULT vcpu_itc_d(VCPU *vcpu, UINT64 pte, UINT64 itir, UINT64 ifa) unsigned long pteval, logps = (itir >> 2) & 0x3f; unsigned long translate_domain_pte(UINT64,UINT64,UINT64); - if (((itir & ~0xfc) >> 2) < PAGE_SHIFT) { + if (((itir & 0xfcL) >> 2) < PAGE_SHIFT) { printf("vcpu_itc_d: domain trying to use smaller page size!\n"); //FIXME: kill domain here while(1); @@ -1599,7 +1599,7 @@ IA64FAULT vcpu_itc_i(VCPU *vcpu, UINT64 pte, UINT64 itir, UINT64 ifa) unsigned long translate_domain_pte(UINT64,UINT64,UINT64); // FIXME: validate ifa here (not in Xen space), COULD MACHINE CHECK! - if (((itir & ~0xfc) >> 2) < PAGE_SHIFT) { + if (((itir & 0xfcL) >> 2) < PAGE_SHIFT) { printf("vcpu_itc_i: domain trying to use smaller page size!\n"); //FIXME: kill domain here while(1); diff --git a/xen/include/asm-ia64/config.h b/xen/include/asm-ia64/config.h index 52e42933bb..55e7ff62cd 100644 --- a/xen/include/asm-ia64/config.h +++ b/xen/include/asm-ia64/config.h @@ -138,41 +138,6 @@ struct page; #define ____cacheline_maxaligned_in_smp #include "asm/types.h" // for u64 -struct device { -#if 0 - struct list_head node; /* node in sibling list */ - struct list_head bus_list; /* node in bus's list */ - struct list_head driver_list; - struct list_head children; - struct device * parent; - - struct kobject kobj; - char bus_id[BUS_ID_SIZE]; /* position on parent bus */ - - struct bus_type * bus; /* type of bus device is on */ - struct device_driver *driver; /* which driver has allocated this - device */ - void *driver_data; /* data private to the driver */ - void *platform_data; /* Platform specific data (e.g. ACPI, - BIOS data relevant to device) */ - struct dev_pm_info power; - u32 power_state; /* Current operating state. In - ACPI-speak, this is D0-D3, D0 - being fully functional, and D3 - being off. */ - - unsigned char *saved_state; /* saved device state */ - u32 detach_state; /* State to enter when device is - detached from its driver. */ - -#endif - u64 *dma_mask; /* dma mask (if dma'able device) */ -#if 0 - struct list_head dma_pools; /* dma pools (if dma'ble) */ - - void (*release)(struct device * dev); -#endif -}; // warning: unless search_extable is declared, the return value gets // truncated to 32-bits, causing a very strange error in privop handling @@ -186,11 +151,6 @@ void sort_extable(struct exception_table_entry *start, struct exception_table_entry *finish); void sort_main_extable(void); -// defined (why?) in include/asm-i386/processor.h -// used in common/physdev.c -#define IO_BITMAP_SIZE 32 -#define IO_BITMAP_BYTES (IO_BITMAP_SIZE * 4) - #define printk printf #undef __ARCH_IRQ_STAT @@ -258,9 +218,6 @@ struct screen_info { }; #define seq_printf(a,b...) printf(b) #define CONFIG_BLK_DEV_INITRD // needed to reserve memory for domain0 -// -#define __smp_processor_id() (current->processor) - // needed for newer ACPI code #define asmlinkage @@ -320,3 +277,4 @@ extern unsigned int watchdog_on; #else # define __attribute_used__ __attribute__((__unused__)) #endif + -- 2.30.2